<?php
date_default_timezone_set('Asia/Shanghai');
/*
git init
git config --global user.name "humingx"
git config --global user.email "humingx@yeah.net"

 ssh-keygen -t rsa -C "humingx@yeah.net"

git clone username@host:/path/to/repository
git config credential.helper store


git add <filename>
git add *

git commit -m "代码提交信息"
git push origin master



git checkout -b feature_x
git checkout master


git branch -d feature_x


git add <filename>
git diff <source_branch> <target_branch>


git checkout -- <filename>

git fetch origin
git reset --hard origin/master



git conflict
git pull --rebase
git mergetool
git add conflict_file
git rebase --continue

ctrl+ww


*/ 
   
?>